Merge "Improve View layoutDirection resolution"