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

Change-Id: I3a7abaf9c5649e8be95a57c618073c55df45e2d1