Merge "Add null check for AclStateChangedHandler"