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

Change-Id: I46aa7def6eb54f967ab568fc459786d0401055d3