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

Change-Id: Ife6f87734f0e8c215a7b439d5dfa0fbc5247d0ce