Merge "Implement API feedback for Safety Center QS" into tm-dev