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 am: 51c9c0f6
Change-Id: I05e86f60d04cb85351fa2384b4616128cf3df180