am c2d256b4: Merge "Improve TextDirection resolution"

* commit 'c2d256b41587ff44efb6373885affe02e5df80b5':
  Improve TextDirection resolution