Merge "Added explicit locking of the data change listener / commit handler registration"