Merge "Check gray scale for ShadowTest" into nyc-dev