Merge "WifiStateMachinePrime: update interface management"