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

Change-Id: Ib27d0abb537fbba05bfa930628f1070f22ef2a72