Merge "Update icons in multiuser settings" into tm-qpr-dev