Merge "Avoid calling the same on change listeners twice"