Merge "Fix bugs revolving around user switching." into udc-qpr-dev