Merge changes from topic "alert-group-transfer-fix"

* changes:
  Fix GroupAlertTransferHelper logic on update.
  Fix heads up/ambient content inflation w/ groups.