Merge changes from topic "AlwaysKeepAppOpsSynced" into qt-dev am: bf5506b240
am: 271551fc81

Change-Id: I6df333e5f2259461c69b8e5783b9f770c511d2eb