Merge "Make overlays modal by default" into main