Mergedevice-config-styleintomain

This branch has no changes from main