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

Change-Id: Ib31c87334d9fc2b9943250b26fcbbcac3921e0cb