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

Change-Id: Ib835633e719cb21efa495ddb5cd749ad60014ce3