Merge "Place black background only behind nav bar when letterboxed" into...
Merge "Place black background only behind nav bar when letterboxed" into oc-dr1-dev am: 3289a5a1 am: 688155ca
am: f90640ab
Change-Id: Ib670c8c2c939fd110134f73878d7df4ea9a7558c