Merge "Update nav bar layout for universal grid" into oc-dr1-dev am: bf15050a0c
am: 33c9314ce1

Change-Id: I7d9b217607f88ae94fdde17bbb19502ee868df18