Merge "Revert Return ILLEGAL_ARGUMENT for setting null callback for 2.4 HAL" into main