Merge "Fix the crash due to multi-register callbacks" into sc-dev