Merge "Remove RestrictedLockUtils dependency in MainSwitchPreference" into sc-dev