Merge "simplify cursor ring draw state; fix null check"