Merge "Limit black background to only base and starting windows" into oc-dr1-dev