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

Change-Id: Ib670c8c2c939fd110134f73878d7df4ea9a7558c