Merge "msm: msm_bus: Make locking during handoff more monolithic"