Merge commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f' * commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f': Allow soft AP settings config before bring up
Merge commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f' * commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f': Allow soft AP settings config before bring up