Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."