Merge "Fix bug #5252977 TextView selection handles appearing in a weird state"