Merge "Settings: Adapt edge-to-edge enforcement" into main