Merge "Remove exposing dialog handling to apps"