Merge "Fixes around cursor blink."