Merge "Properly synchronize interactivity state." into mnc-dev