Merge "Bug 2517: Catch RuntimeExceptions thrown from the DCL in DataChangeListener"