Merge "Add null check before using mCallback"