Merge "Fixing drawable cloning does not preserve badge"