Merge "msm-camera: allow non-zero Y offset." into msm-3.0