Merge "Volume dialog should show the volume for the group id that is being changed." into qt-dev
am: e2c19dd03c

Change-Id: Ib53058c9264cdd3a0e65b525914fcea41771d0e4