Merge "Several tweaks to smoothen tile creation experience" into main