Merge some fixes from master branch

* Set lock when adding new displays to the chain
* simplesound: fixed CHANSRV_PORT_STR undefined error