Merge "Fix tab indicator getting out of sync" into mnc-ub-dev