Merge changes I34903b57,Ic818aa55 into main

* changes:
  SyncSM07: Replace IpServer's state machine with StateMachineShim
  SyncSM06: Add StateMachineShim