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