Merge "Fix softap start"