Fix deliveries overlap with emojies.

Merged Julien Wadel requested to merge fix/update into release/5.2

Update SDK to 5.3.1

Merge request reports