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