Close old cursor when making a new one. am: 18ef3bfd47
am: 93e0e15704

Change-Id: Ibdef5c5799d7a3afe59e3795ca6624a27a2bcbd4