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

Change-Id: I3f110169a75534ec54f71f00616e1feaf20f733b