Merge "Add aspect ratio setting button in window handle menu" into main