Merge "Fix vibration race condition in Ringer." into udc-dev