Merge "Fixed ActivityChooser logic for the initial case."