Merge "Fix Handle Menu window width and height" into main