Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev