Merge "Fix race conditions related to ringer mode"