Merge "msm: camera: Fix for camera powerup crash"