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

Change-Id: I5c8896792aa0e939479c58c9f3627d3a888a0d76