Merge "Changes to support navigation bar system UI in car mode."