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: b8acd251
Change-Id: I8e37636a30f0f1f406e9830a70890acb1e23ffed