Merge "Don't dismiss keyguard when enabling it" into qt-dev am: 785a88846a am: 52a586e034
am: 99881515a9

Change-Id: If01ab4e082681c4ad23ae2aa313e84546d6acba2