Merge "Fallback to default volume handling when session is released" into qt-dev am: d1008f8339
am: 1691f87f2b

Change-Id: I9351361751e769cedc6a40b042a21c6c78a750d0