Merge "Use realActivity name when comparing if intents are the same" into nyc-dev