Merge "Limit black background to only base and starting windows" into oc-dr1-dev am: 44cab75cb0
am: 024494041f

Change-Id: I58a99c4622bac7e3e0267f20f8871523c8271465