Merge "Add check to not resample when resample time equals motion event time" into main