Merge "Fix Maximize Portrait Scenario + Snap Resize not finding traces" into main