Show error dialogs over apps that dismiss keyguard automerge: c08eab8
automerge: 2b9e9f4

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