Remove more calls to addFullExpansionListener

Bug: 300243163
Test: updated existing tests
Test: manual
Change-Id: Ic3144a834001a063ac48ac0c7a8dd2ffb77ae2ed
16 files changed