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

Change-Id: Ifef4e6978d0731b6270eb0fc0b1fe23fe27d1d3b