Merge "Merge "Limit black background to only base and starting windows" into oc-dr1-dev am: 44cab75cb0 am: 68f48673c7 am: 992e299ec2"