Merge "[DO NOT MERGE] Migrate clock and lock icon to flows" into tm-qpr-dev