Merge "Timing issue that sometimes listen mask set incorrectly"