Merge "AudioFlinger: Fix haptic race condition" into qt-dev