merge xt926 device changes