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

Change-Id: I87966d38e8b23441837760db1e17e2957468adfa