Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1