Merge "Fix SwitchCompat animating unnecessarily" into lmp-mr1-ub-dev