Merge "[DO NOT MERGE] Bouncer - Update selected item text color" into tm-dev