Merge "Make KeyguardPresentation inherit Theme.SystemUI" into qt-dev