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