Merge "Remove haptics on navbar and only have button haptics on touch up" into pi-dev