Merge "Prepare for refactoring wifi ipserver start/stop" into tm-dev