Merge "Split WifiStateMachine from WifiStateTracker"