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

Change-Id: Ie6ebda165367e5fbabff3241e40a8d6fd378b31d