Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev