Merge "Reset short term model on user switch." into pi-dev