Bug 850647 & 796492 

As described in the first bug, there is a trivial fix. It's essential though for a clean fix of bug 796492.
The second commit is a fix for 796492 and prevents volume level change by hw buttons if the screen is off and no audio channel is active.