Merge "Fix text alignment with rtl languages in entity header." into pi-dev