Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
am: 3dc5e0ae3a

Change-Id: Ied6d9ca3f60b66aceebb326c536aea0267d166ad