Merge "Update clock when turning the screen on" into qt-r1-dev