Merge "Reduce the delay during headset removal"