Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev