Merge "ChooserActivity direct share jank fixes" into nyc-dev