Merge "Fix Tab click not updating the visible selected Tab" into lmp-mr1-ub-dev