Merge "Prevent UdfpsController missing touches when an Up event is missed" into main