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

Change-Id: Ic069b7f242a1c42f1034e91c8a3440c7c4b885b8