Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev