Merge "Fix animation glitch for PreferenceCategory views" into mnc-ub-dev