Merge "Always trigger safe mode callbacks" into sc-qpr1-dev