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

Change-Id: Id567cedb12c902f425ca9612634f0d93316efafa