FIX: Option to use volume keys to control media volume anytime (2/2)

Change-Id: I78d26b0bd41f5b58514ae9c68208a8c950396823