Merge "Fix missing taskbar scrim in folded state when swiping up from immersive mode" into main