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

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