Merge "Allow Windows in Display Overlays"