Merge "Cleanup logic in KillZramBackingDevice" into rvc-dev