Merge "Removing unused intent extra" into nyc-dev