Merge "Fix empty state Chooser Activity UX" into nyc-dev