Snap: Port all string improvements from lineage-16.0

* This is a mess

Change-Id: I91b46d2e54c78f55b31fa8b45156d74ca05e8027
3 files changed