Fix deviceType property propogation.