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

Change-Id: I09753bb2167a9cec31a07169bb3b478e75063317