Merge "Fix clock alpha when awake" into qt-qpr1-dev am: 5a7e009b8c
am: 95caf3907b

Change-Id: Ibb03a7dae910312bb29c9fede8a418dfa108cc45