Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev