am 2c5dca4a: Reconcile with jb-mr2-release - do not merge

* commit '2c5dca4a3f227d5e4e103bdbd61f584446bd229f':
  Fix keyguard pattern invalidate bug
  Ensure looper quits after all other messages are handled.