Merge "Ensure that the shortcuts added to conversations are longlived" into rvc-dev am: 7cb34c50 am: 92f9b599 Change-Id: If467655479cc1d13b924a28067c14fd2e097e5c5