Merge "SwitchCompat improvements" into mnc-ub-dev