Merge "Fix Tab indicator animation glitch" into mnc-ub-dev