Merge "Use correct windowingMode when computing override config" into pi-dev