Merge "Retain the short-term model when device state changes" into tm-qpr-dev