Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev