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

Change-Id: I7f554d9e7739f18d0b27a72cd5bc5d7be24196af