Merge "Fix text alignment with rtl languages in entity header." into pi-dev am: 7298297007
am: 7a9b76f841

Change-Id: I0ca3923539e72d7efd0ce98ddac06c0811b9f60d