Merge "Fix photo alignment in RTL locales in ContactEntryListAdapter"