Merge "Trace screenshotApplications" into nyc-dev