Merge "Extract shared utils so they can be used without depending on core Shell." into main