Merge "Repackage nav bar code into view and controller logic separately" into main