am 126037ea: am d6748a79: Work around volume change jank.

* commit '126037ea489c7d675f92195f48a000976a3cf50c':
  Work around volume change jank.