Merge "Add shadow to text on keyguard" into qt-dev