Merge "Remap PS key to BUTTON_MODE"