am 877f0a4d: Merge "Treat missing Cursor as FNFE." into jb-dev

* commit '877f0a4d23d4be09a2c3b2f3e637cc3d1332e160':
  Treat missing Cursor as FNFE.