Merge "Fix the RichInputConnectionAndTextRangeTests"