Merge "Fix clock alpha when awake" into qt-qpr1-dev