Merge "mfd: Reorder slimbus disconnect port and channel" into msm-3.4