am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev

* commit 'cc855ad737e61fc02a057e811f2e6e34bbff0e37':
  Properly synchronize interactivity state.