Merge "Set P2p statemachine's network manager before starting Wifi" into klp-dev