Merge "msm: camera: camera lens placed at mechanical infinity" into msm-3.0