Merge "Re-codegen ScreenshotHash.java" into sc-dev