Merge "Roll back nav bar interface to version 2" into oc-mr1-dev