Merge "Add additional debug logs to clock view" into tm-dev