Merge "Fix leak in nav bar" into oc-dev am: 0b67d53ba9
am: cea904333e

Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df