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

Change-Id: Ifbdae7b95603c76f6cc49e5cc3a28a3dfac46a4f