Merge "Notify ClockChangedListeners on main thread"