Merge "Ensure that the shortcuts added to conversations are longlived" into...
Merge "Ensure that the shortcuts added to conversations are longlived" into rvc-dev am: 7cb34c50 am: e27c6450 am: 9104e508
Change-Id: Id50bc606d9af1f42f5123606695cf69e36992342