Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev