Merge "SoftApCallback using executor vs handler"