Merge "Don't create a delegate for null callbacks." into lmp-dev