Merge "Introduce TextView drawableStart and drawableEnd"