Merge changes I46a4b3ee,I01b0a6ab

* changes:
  Support SAP and LOHS enabled at the same time
  Allow SAP and LOHS wifi clients exist at the same time