Merge "Updating screenshot icon." into nyc-dev