Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev