Merge "Revert "OMS: never filter out isStatic="true" overlays""