Merge "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"