Merge "Ensure that the shortcuts added to conversations are longlived" into rvc-dev