Merge "GKI_exception on running longer batch scans" into lmp-dev