Merge "Use swapCursor(null) instead of changeCursor(null)"