Merge "onMove in CachedCursor shouldn't call the underlying cursor's method"