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

Change-Id: Ic02e24f01cf70f736396ce95baaa782c53407fda