Merge "msm: camera: Fix AXI HALT issue"