Merge "Tighten the checks around a detector being invalidated" into lmp-dev