Merge "Improve resolution of inherited layout direction"