Merge "Update Desktop Mode handle menu position during rotation" into udc-dev