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