Merge "Remove transient StartingState from TetherInterfaceSM"