am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit '07a630d23ef326f820e6339b5f691df0aafd3574':
  Fix issue #4291805: Tap Fish crashes on launch