Merge "Updated the layout for the activity chooser view."