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

Change-Id: I08ac9f6aa9bec70f0248cca128dba466c2754d82