Merge "Fix leak in nav bar" into oc-dev