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

Change-Id: Ia2c3d8d29668efede0a3ea0a07e4ae10bec487ed