Merge "Keep callback reference from being null." into jb-mr1-dev