Merge "Add tracing to clock doze animation..." into main