Merge "Fix bug #9073962 - Carret is still on the left with an empty EditText in Arabic Locale"