Merge "New string for resolving ACTION_SENDTO intents" into nyc-dev