Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev
am: 3289a5a1e0

Change-Id: Ic1a1c1a1d023e0da39a11b4213a2276bbb42cbd6