Merge "Prevent dialog from invalid context"