Merge "Do not disappear text when moving tiles" into sc-dev