Merge "Prepare for refactoring wifi ipserver start/stop"