Merge "Update DND strings and image spacing" into rvc-dev