Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev