Merge "Swap freeform vs non-freeform TO_FULLSCREEN heights." into main