Merge "Ensure SwitchCompat jumps the thumb position" into mnc-ub-dev