Merge "mmc: block: fix partition switch failure observed during shutdown" into msm-4.9