Merge changes Ib7fe8982,I917b005a into main

* changes:
  Expose NAME constant from a companion property for testing
  Streamline RootTaskInfo creation for testing