Merge "BiDi support for Minikin"