Merge "Ignore drag action on the switch button of MasterSwitchPreference"