SpecialVersion: Show 'Skins' and 'Extensions' in separate sections

Change-Id: Ifa4aa1a2ad31228b4bff833f34727e80e19b9ae3
Merge "SpecialVersion: Show 'Skins' and 'Extensions' in separate sections"