Merge "msm: camera: fix camera crash after daemon reboot"