am f8b877c2: Update indicators at the right time to show the correct state.

* commit 'f8b877c2dd4fed2c962c51d619e2548923888525':
  Update indicators at the right time to show the correct state.