Merge "Change maximize menu maximize button to restore when task maximized" into main