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

Change-Id: I445e5fb72411d483bce53e54a00a008625193999