Merge "Preventing keyguard dismissal when screen is off." into qt-dev