favor entry adapter usage over entry listener
revert to entry listener usage
Merge pull request #4135 from ahmetmircik/improvement/3.4/favorEntryAdapter

Favor entry adapter usage over entry listener