Merge "[User Switcher] Finish activity when switch user" into tm-dev