Revert "Revert "Multi-user support for phones [2/2]""

This reverts commit 57b2f3db8ace8e5e8fef12bf27ddf4ad37299a2a.