Merge "Handle stopped users in onCleanupUser"