Merge "[DO NOT MERGE] Fix clipping of text in two action preferences" into sc-v2-dev