Merge "Fix data state change callbacks"