Recovery key mapped to VolUp + EndCall
Merge remote-tracking branch 'upstream/master'