Merge "Add null checks before using mViewMediatorCallback." into jb-mr1-dev