Merge "Activity selections not always persisted by AcitivtyChooserView."