Merge "Fix View reset of layoutDirection and textDirection"