Merge "Correctly identify Clock tab at first launch on RTL" into lmp-mr1-dev