Merge "Use a SwitchPreference for auto-rotate instead"