Merge "Introduce a per-call wait for performHapticFeedback benchmark (excluded from the timing)."