Merge "Fix SwitchCompat animating while not visible" into mnc-ub-dev