Merge "RTL alignment issue for arrow corrected." into main