Show error dialogs over apps that dismiss keyguard
automerge: c08eab8

* commit 'c08eab81f30a3120ec0929d3508b4a78d498e1ff':
  Show error dialogs over apps that dismiss keyguard