Merge "SwitchCompat fixes and tweaks" into lmp-mr1-ub-dev