Merge "CDS: Move DataChangeListener into a support class"