Merge "[User Switcher] Fix wrap method for large..." into tm-qpr-dev