Merge "Fix default TextView textDirection heuristic"