Merge "Improved keyboard navigation cursor rings"