Merge "[DO NOT MERGE] Enable Custom LS Clocks in Teamfood" into tm-qpr-dev