Merge "Update new spec for ThemePicker preview" into ub-launcher3-master