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