Merge "Fix failing Framework TextView tests."