Merge "Update handle menu coordinates properly on rotate." into main