Merge "Dont set windowBackground to null" into nyc-support-25.1-dev