Merge "mm: Drain pages after onlining" into msm-3.0