Merge "[CS] Remove unused ScrimController#setCurrentUser." into udc-qpr-dev