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

Change-Id: I209c1652b6059242e09773a2f0de031226926ead