Merge "Revert "Allow UMO to show over the dream"" into main