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

Change-Id: I6f673d413abfe9b773ada6029a1f7c1290ca9cfe