Merge "Make addExpansionListener not send a change event on add" into udc-dev