Merge "Add hover support to maximize menu" into main