Merge "BUG 1735 Registering a data change listener should be asynchronous"