Merge "Catch IllegalArgumentException when unregister callback" into main