Merge "Fix ShadowGrid in UiBench" into nyc-mr1-dev