Merge "Fix bug #4584320 Single Line EditText not drawing correctly with spans applied (ICS)"