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