Merge "Revert "Remove more calls to addFullExpansionListener"" into main