Merge "Fixing tiles losing subtext in split shade" into sc-v2-dev