Merge "Center layout of nav inflator to wrap content to tap other buttons" into pi-dev
am: 232efa8ce7

Change-Id: I478f3106d038f9c20ecdd8584d0456332046b177