Merge "Don't dismiss keyguard when enabling it" into qt-dev