Merge "Forward device updates when info changes" into tm-dev