Merge "VolumeShaper: Enable xOffset from Java" into oc-dev