Merge "Only enable listen-A when there is only DH"