Merged in default (pull request #703)

Remove the conversation placement preferences and code.

Approved-by: Elliott Sales de Andrade
Approved-by: John Bailey