Remove per-user preference when the user is removed

Test: new test for this
Change-Id: I335e82e29ec8f4c8da9def8b40153858cfd5bacb
2 files changed