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

Change-Id: If9982b159f4e347a2b62dadc6662fa9d0e089ffd