am 0dfda02e: am 1a3f7db0: VolumeDialog: Restore default-selection logic.
automerge: 0a76c47

* commit '0a76c47e7134a10d9aa61d27e7b9f99569ed20da':
  VolumeDialog: Restore default-selection logic.