Merge "Fix cursorRingBounds NPE"