Merge "Don't animate clock when turning screen off." into qt-r1-dev