Merge "Dismissed keyguard gone runnables when aborting" into qt-qpr1-dev