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

* commit '3314a31377e60ee11335cc51a2e3dba86b36bb7e':
  Fix bug 4021346 - crash while navigating