Merge "crypto: msm: Fix XO shutdown issues"