Small move/rename diff to convert this hook into a general function. This "hook" was not using any react features so this really should just be a function

Depends on D8600

flow and confirmed that native and web apps work fine