Merge "Synchronize access to mCurrentState when updating" into tm-dev