Merge "Fixes KeyButtonView to dismiss ripple after aborting for long press" into pi-dev