Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev