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

Change-Id: I11c4aada02fa3b5bea4f10033dc68e07a33b523f