Merge "Migrate CALLBACK_ON_CLEAR_CHANGE"