Merge "Use the correct background color for tiles." into main