Merge "Show DialpadChooser correctly."