Merge "portability: Fix a bug where long AF callbacks caused ISE timeouts" into lmp-dev