Merge "msm:camera: Fix liveshot stop logic"