Merge "Chooser filtering and caller direct share targets" into nyc-dev