Merge "Stop closing maximize menu when view inside maximize menu is exited" into main