Merge "Remove prohibition on switching to user 0 in demo" into pi-dev