Merge "Text blinking cursor hard to see." into ics-mr1