Merge "SkinFallbackTemplate: Remove outdated @todo"