Merge "Improve strings for share sheet and intent resolvers." into rvc-dev