Merge "Return ILLEGAL_ARGUMENT for setting null callback" into main