Merge "Fixing issues in Maximize Menu" into main