Merge "Mark current tiles as auto-added" into main