am 13f94dc5: Merge "Fix race conditions related to ringer mode"

* commit '13f94dc5bdea85608cb2f9bded4e390389d40c0c':
  Fix race conditions related to ringer mode