Merge "Move reset haptic effect into the move event handling." into tm-qpr-dev