Merge "Fix that icons overlapped in Preview at Display size and text screen under Vision Settings." into tm-dev