Merge "Change dial pad to show chooser onStart instead of onCreate." into jb-mr1.1-dev