Merge "Restore split layout when wm-shell no longer controlling IME" into sc-dev