Merge "Update nav bar layout for universal grid" into oc-dr1-dev