Merge changes from topic "AlwaysKeepAppOpsSynced" into qt-dev am: bf5506b240
am: 5406854a5f

Change-Id: If4dd41e50371dd815559bfbc82a5c29da09565cb