Fix an NPE.  Apparently mScanNetworkTask can be null at this point.
Merge branch 'master' into actionbar

* master:
  Fix an NPE.  Apparently mScanNetworkTask can be null at this point.