Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev