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