Merge "Update clock when turning the screen on" into qt-r1-dev am: 68d625bea6
am: aae92427cb

Change-Id: Id2f23c3f4a2c58e60ca84a8926ff34d5192c7ab0