Merge "Remove onStart UDFPS haptic" into tm-dev