Merge "Revert "Fix tab blinking while fling"" into lmp-mr1-ub-dev