Merge "Update Maximize Menu UI" into main