Bug: 13336 Fix removing device state when multiple accounts exist on the same device.
BFN