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

Change-Id: I51c1fc2b074bbbe98254812f202c7755558e42af