Merge "Center layout of nav inflator to wrap content to tap other buttons" into pi-dev am: 232efa8c am: cd6564d3 Change-Id: If8f86e17a915faea7842d14e37c2a96b5b81490e