Best to create two images for now. Cedartrail fix alters the X server settings, which could cause problems with some video cards.
Easiest way to do this is to create the image for your regular devices, install it on a Cedartrail device, apply the fix, and create your Cedartrail key from there.