Merge "Revert "Revert "Rename IUsdInterface to IStaInterface in the Mai..."" into main