am 1950d2e6: am af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."

# By Jangwon Lee
# Via Android Git Automerger (1) and others
* commit '1950d2e6575e04fc623d1d0bcc32393ce4dfef93':
  Fix bugs regarding IllegalStateException during moving position in cursorwindow.