Merge "Make the volume keys adjust the media volume by default if the device is not "voice capable.""