Merge "Bug fixes for ContactTileRow"