Merge "Fix bug with split screen not recognizing user differences" into tm-qpr-dev