Merge "Stop previous user's packages early during user switch" into main