am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1

* commit 'a46c1df226f2aea54d3bb068b0537c9b1d28590c':
  Fix bug 4021346 - crash while navigating