Merge "Fix a bug that onOpChanged callbacks are not called."