F27 Self Contained Change: Improved Bay- and Cherry-Trail device support