Merge "Swap param order in registerSoftApCallback"