Merge "Fix manage menu position after rotation" into main