Merge "msm: camera: Set proper state of parent object while merging" into msm-4.9