Merge "[pm/unarchival] allow error handling dialogs to be started from background after user confirmation" into main