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

Change-Id: Id4069e1c1126d9658a18a448a4bd7566af938cbb