Merge "Update inverseLayerTransform for screenshots" into udc-dev