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

* commit 'af08ccb20dbfc19c668c6566ca17f2464ad12696':
  Add null checks before using mViewMediatorCallback.