Merge "Fix layout for read-only contacts"