Merge "Fix possible NPE on showDialpadChooser()"