Merge "Fix race condition in Ringer"