Merge "Add missing mApps synchronization"