Merge "Fix bug 5205275 - SwitchPreference doesn't allow Switch to slide back and forth."