Merge "Fixes KeyButtonView to dismiss ripple after aborting for long press" into pi-dev am: 12da48e095
am: 23219d310f

Change-Id: I142bf4c21758247d54687997849fb90e957f88d3