Merge "Cleanup logic in KillZramBackingDevice"