ganfra
1522f48156
Merge branch 'develop' into feature/fga/live_location_sharing_setup
# Conflicts:
# tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en.png
# tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en.png
# tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_8_en.png
# tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_8_en.png