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

Change-Id: Idc7e6f35916550aefcedf0c35588732203425a67