Merge "sthal: add a check to skip client detection callback"