Merge "Fix incorrectly sized overlay for unfold animation" into main