Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d am: d789b7b99f" into oc-mr1-dev-plus-aosp