Merge "Migrate OneHanded to WM shell (4/n)"