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

Change-Id: If52e7eae135f1c977d498fa22d297cb056b71a06