Split SkinFallback and SkinfallbackTemplate

Change-Id: I55c866c08d4f442021c43068efe64be871afb96b