Merge "Fix regression in virtual key haptics" into pi-dev am: c197176cd2
am: 29218b8fc7

Change-Id: Ic763bc85534ec34082b50aeacef26786ce234161