Merge "WifiStateMachine: fix for exiting L2ConnectedState" into klp-dev