am 26bf4d90: Merge "Optimize media button stack traversal for remote volume"

* commit '26bf4d9020dcb16327e91044cda78b3baef723b5':
  Optimize media button stack traversal for remote volume