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