Merge "Dismissed keyguard gone runnables when aborting" into qt-qpr1-dev am: 3ce82b7ae4
am: 71d55428c9

Change-Id: I72b803c28db80ee3fe930912f23ca9484ff62aba