Merge "Don't bind ChooserTargetServices as user CURRENT" into nyc-dev