Cancel in-progress computations before saving state

Bug: 26177070

We weren't cancelling in-progress computations, which caused the
resulting events to arrive after the state was already saved.

Change-Id: If694ca6e01d53fc2c8ee451e917b7a0f8510f51d